Grunt fixes

Fixes for some grunt warnings, mainly unused variables that were declared.