Couple minor changes to where client connections are cleared.