remove additional occurences of old 'origin' flag