clean up client, add deferred flag