Merge "Drop EXTRA_FORMULAS logic"