timob-15951: removed unnecessary code