Elminate the location context crap ;)