Some were in an unused function, so I removed that function. Some were in graceful_shutdown and can't really be handled. So I made them into "expect"s