KFSUPGRADE-1010 removing uneeded bc code