Removed classes that are no longer needed.