Form cleanup all around