Eliminated one unnecessary class.