Drop conflicts with removed formulae

Closes #35292.