Remove the deprecated classes and functions