minor cleanups following state cleanups