cleaned up startup and service registering