Cleanup/3.x/clientproxy destroy