Removing smtp for now