Merged the unfinished document states into the development branch, reverting.
Remove unused document indexing utils module
Fix method name
Start using names that make more sense