misc cleanup before merging into master