They are replaced by either Prop/Set or prop/set
This commit has multiple unfinished proofs (commented out)