some cleanups in status