More comments taken out