Got rid of a unnecessary class.