Removed conflicts and unnecessary optional