Remove most of the conflict checking and auto-hiding