cleanup, mostly