CLeaned up comments and removed unused methods.
Removed unused view template.
Merge branch 'messages'