Remove avatar upload duplication.