grunt -> gulp; cleanup