Merge "Remove unused ARM nodes"