Remove the currentLoaction pattern assumption