removing unnecessary avatarId query