adjust form*: delete form.class.*, adjust form2