Simplifying stuff and removing several not-needed email configs