Cleanup and Grunt configuration