MINDEXER-87: Remove legacy marked code

- Committing work in progress (tests still not working).