US507 cleanup after merge