cleanups caught during PR review