Merge "Remove unused fields from User"