Remove grunticon
Tidy up boilerplate