Code cleanup

(1) Further code cleanup.  No additions.