Clean up form
Merge new form