Removed more old service code