timob-11604: code clean-up