Fix email address and remove old TODOs