otf: clean up