Removing things that cause conflicts