[Form] Simplify last commit