Cleanup for new branch structure.