Removed some deprecated classes