CDAP-988 remove unneeded changes.