regs #44 - cleanups