Expand Gruntfile, cleanup