removed commented-out blocks
removed commented-out blocks