Got rid of a class that should have not been gotten rid of...