yet more code cleanup #12701