Removed the need for a users email/ changed first time user activity and
removed unused imports.