Simplify IndexService remove logic