CON-22 | FormBuilder - cleaning