Improvement/3.x/operationservice response cleanup