remove some further TODOs around schema name usage with indexes