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