Cleaning up client connector logic