Updated configuration files to add SMTP and cleanup