Grunt cleanup, and deleted more unused code