Address issue #261

Make sure Channel._cleanup is called when the channel is closed
Remove any lingering callbacks for a removed channel, rename an internal method variable