Cleanup, remove Grunt, add in old code.