more #482 cleanups