Unused wait condition commented out.
Small modifications (connection destruction).