Removed unnecessary classes and functionality