Clean up intentional element indexing