Fixes avatar default value use, refactors User.remove(phoneNumber)