Simplified the grunt build