Feature/club 585

Do you need these two commented lines?