housecleaning before merging back into master