Removed obsolete classes and comments