Grunt clean-up