Clean close
Use a real state in criterion search