Weee
Removes debug hard coded email address
Merge