Cleanup client mess