More Gruntfile cleanup