Remove some more unneeded classes

Reason is the same as before