cleanup from first review

Attempted to fix all issues noted in first review save one item: still
need to add delete clef id's on uninstall.