KFSUPGRADE-993 : remove un-referenced imports, so it would be the same
as master