Removed unused/unnecessary classes and code