Remove the use of FileLookupFactory