Removed commented-out experimental code