Improved Singleton instantiation

Removed (commented for now) some unused methods
Misc cleanups