REVIEW: Unpack cleanup

kills plexus annotations and some other minor cleanup.