Simple form cleanup