[Pki-devel] [PATCH] 0077..0081 assorted code deletions