removed commeted code