cleanup, client still screwed up