clean up form-routes and demo.js in preparation of mirroring into a state router