MISC - Remove conflict code