more minor cleanup of shutdown class part II