CLUB-207 some cleaning related with this ticket