Revert "us3035 noticed some missing indices while fixing so adding them"

This reverts commit 29673227bb6e38defa8e054c99e08941b6ad032f.