Commit from last night: step 1 fixing remove email address