#15: cleanup