Some cleanup before branching