Simplify IndexService remove logic

leftover I will fix