Strip out excessive logging
Clarify the shutdown mechanism with comments