cleaning up branch in prep for merge