Experimenting with removing uneeded upper scan limit