Singleton clean up