Clean up forms and views