Removed unused classes and updated dependencies