Housekeeping and cleanup.

Additions and deletions for convenience.