More Grunt cleanup