Merge "Remove unused northbound"