cleanup and meta hack for client_name