fallback reactors and more cleanups