Unused imports removed. Should not throw exception if no avatar