CDAP-489: code clean