Got rid of another useless class.