Remove remnants of some cleanup; no functional changes.

Sponsored by:	The FreeBSD Foundation


git-svn-id: svn+ssh://svn.freebsd.org/base/head@272836 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f