API cleanup continues
Cleaned up change email logic
Cleaned up mail module