ENH: remove indices_ and refactor oob logic