CDAP-506: remove unnecessary lines of code