hotfix cleanup including grunt #5