Should we keep current location: XXX ? at all, I was wondering if we can remove that as well.