Gotten rid of an unnecessary class.