cleaning up forms and routes