Cleanup and mail form
more cleanup