Remove services, modify comments