Remove options reinstated by merge