remove separate Avatar UUID -closes #1621 -closes #1622