updated email address

+ minor tweaks
+ removed unused code