more minor cleanup of shutdown class