Clean up unnecessary files
Make changed suggested by review

Un-hardcode email address, throw descriptive error if not properly
configured, remove dead commented code.