more branch cleanup