CLUB-820, removed comments