some core cleanup, form2 started to add validation