KFSUPGRADE-1017 code cleanup, comments