Remove service code