removed commended code