Locator: Use nfile and nproject when posible. Part 3
remove bad merge. Part 2