Removed commented-out code