Remove unused forms

Removed forms that were used by the old API and unnecessary for the
new one.
Fix a form validation error

Fixes a problem that resulted in event 925f4afc1a2d49b38ab69bd5d2e0b276