Removed a lot of the service factory stuff