Add a little logging.

Remove duplication of disconnection cleanup.