More code cleanups (no feature change)