Remove file_id from indexing routines