Add remove_avatar ???