remove stdctrl and eleminate watchuntil where applicable