Revert "preparing for avatar"

This reverts commit 6ec6824951481b17885a41bbf4935ab3427a1b6f.