Tidy up and remove invalid option for replica set client.