Removed Old Singleton