Remove getinfo_super_n and do some other cleaning up.