Squash another org_form class