Clean up some forms