Cleanups on reactify