mostly cleanups