Remove orphan winner logic