[cleanup] Removed some unused classes