Cleanup and Add Email Confirmations to Sign-up