Remove deprecated methods and classes