removed commeneted code