Clean up of UserFormAction API and action handling