Fix Branches being visible on org/branch component view
Cleanups