KRACOEUS-7091: removing junk comments, fixing log statements