Clean up of the services... now back to real work