Some form cleanup