Initial clean up of service managers