Clean up singleton-service implementation internals