Remove some uses of assumeProof and BUGGY condition which are no longer necessary