Deleting useless Classes

And again Git didn't get that classes were deleted before the last
commit...
So they are getting their own commit again.