Output confinement patches removing old calls