Kill some dead code on source and sink closing.
Merge pull request #597 from square/jwilson_0304_kill_some_dead_code

Kill some dead code on source and sink closing.