remove avatar border in it’s a match
remove some unused comment