cleanup, back to state before branching tests