Singleton removed