Remove duplicates from User class and use Account versions