cleaning up odl side trying to achieve consistent response