timob-14349: clean up