Fix remove control

This PR fixes some issues with manually removing and adding controls from forms:
1) Validity changes in removed control do not effect form validity
2) Validity of existing control is taken into account when adding control to form