Removing more annotations
Moving out additional Grunt tasks