Merge "Remove useless branches for Armoury"