Grunt fixes

Remove some unused variable declarations. Fewer grunt warnings after cleanup.