Cleanup package.json and gruntfile