Update and remove deprecated methods in locationutils and blocklistener

Also fix an /unlimited bug with tools
I see.. I will have to repull this, git blocking changes.