cleanups, no changes in functionality.