steadystate: more cleanups