#312 Removed more unneeded classes