Update base form code.
Update base form code.

Revert lint changes as it touched on reserved variables

Moved delete mutation to separate function to improve nested mutation readability

alexisrolland/data-quality,alexisrolland/data-quality,alexisrolland/data-quality,alexisrolland/data-quality