Remove some unused classes