Removed old location api, implementing new one