Remove unecessary $form_state['controller'] hack

$form_state['controller'] has been removed as it is now the normal form object. The submit improvements allow to remove the hack there. Did not test manually.