remove references to "super"