Removed unnecessary methods and classes