Revert "Make sure client resources cleaned up"

This reverts commit cf4ee52ce776dc424e5919d44cf6ee8ad3b2b0b0.