more state cleanups