Clean up various stuff and convert to using Grunt