Grunt build cleanup Phase 1