Grunt optimizations, removing dead wood