Remove old stuff.
Rework form handling - WIP