functional: clean up after jonboulle