more cleanups in arch