more contact form cleanup