BZ-9677 - removing classes from avatar