MFC r255235:
  Remove unused code and sort variables declarations.

PR:		kern/181822