Pruned some commented code