email fix and remove job stuff