final cleanup before branch