Cleanup for create client data