Removed Email Connect stuff