Removed unnecessary classes and functions.