Updated model
Removed commented out code.
Removed mail modules as communication is generally done in a different
way now.