Update clean_server_db with OPTIONAL MATCH