Now that we moved to ES standard replacements, let's make sure they don't creep back in accidentally.