remove mode cluase from logic