Removed more special purpose classes