removed some true = true code