package and gruntfile cleanup