Issue #93. Removed TSingleton.
Removed unnecessary classes.