remove code related to avatars