remove unused connection code
better default client logic