Started code cleanup of form components (simplify)