cleanup and fixing client remove connection callback timing
cleanup and fixing client remove connection callback timing