Removed unused/obsolete classes