more cleanup in the branch trait department