Cleaning up

prep for rebase
again