timob-14793: clean up code