cleaning up my branching mess