commented code and ScalaZ3 workaround are removed