Finish basic importing, remove useless oldEmail parameter

We use IDs now, not email. No need to pass it around