Remove some unused vars and some cleanup
Remove some unused vars and some cleanup

AmpersandJS/ampersand-state,STRML/ampersand-state-lodash,dhritzkiv/ampersand-state,mrwingfield/ampersand-state,adityapunjani/ampersand-state