KFSUPGRADE-993 : code clean up