Removed unnecessary dependencies and deprecated classes