Cleanup by Costa. Added new service.