Fixes #12165 Also changed the index naming convention because some were not properly name and would have caused conflicts in the long run
We could remove a lot more than this, this is just a start. There are various tools to help with this, knip is a good one
