timob-16485: clean up code