Remove some unused classes
Remove unused methods