Remove confusing ors and nots