miscellaneous cleanup

commit-by-commit