Remove commented out code.
Remove method w/o implementation.
Review shut down sequence (see #10633)