Clean-up

Tested detection of Y1, and we’ve got it in all bands(!!!), so I’m not
adding in non-detection as something to be handled. Also eliminated
some junk code at the end.