Cleaning up client privates and configuration checks