New format

Removed commented code. Commented SendEmail as Service has bug.