Removed commeneted out code