Cleaned up some of the services