remove compat crap, other cleanups; remove old port-number peek