CDAP-610: removed unused variables