Jhbate/remove armada

@kentquirk - this is just the cleanup for removing armada