Got rid of extraneous class