Clean and fix demers client