Clean up Gruntfile.js and package.json