Remove some superfluous code from discover()