Remove the use of Singleton