Remove extraneous "class requirements" and fix instantiation