Remove no longer relevant comment
Clean up by using index_by