Removed old services definitions