some cleanup, prep for multi-machine