Remove dependency on FileIndexManager