issue-12: clean up