Remove remnants of some cleanup; no functional changes.

Sponsored by:	The FreeBSD Foundation