Removed some redundant classes

They might be added again later!