more cleanups, fixed execution condition, consolidated reinstall validation