Cleaned up services