Fixed up code
removed unnecessary class.