refactor AbstractFormBuilder, deprecate things