Removing deprecated classes