Cleanup after merging PR #7