Removed some of the obselete classes