Remove unused code
__block here doesn't appear to be necessary anymore
Narrowing searches now always takes account of protection mode