cleanup after merging PR #4