grunt -> gulp and cleanup