Fixed some typos (Email -> e-mail)
Removed unused code
Cleaned up
Added TODO item