trebon: clean-up