Fix up form state and submitForm()
Remove unecessary functions, clean up redirect creation for aliases.