More clients.conf cleanup