[CLEANUP] Grunt and npm cleanup