Remove usage of drupal_form_submit()