Not needed anymore

These classes are not needed anymore, but just in case I won't delete
the entire classes yet.