Cleanup. Fixed broken client.