Clean user IDs
Merge branch 'v3' into stuff