Cleaned up the creation of services and servers.