I can just remove this code on merge - it's dead code