timob-16679: code clean up