Removed unused deprecated classes