#17: cleanup