add vars, remove redundant supers