Remove imports
Fix retrieval of user photo (see #11110)