It should be removed, if not now, later, but certainly in a separate commit as it's a separate domain change.