changes to setup and removed default email