Tidy up from old grunt config