opensolaris.org cleanup; closes issue #5