Remove unused classes and deprecations