#339: cleanup