Removed classes and tests