update locator, remove unused import