Reduce templating and sprintf calls in CellIndex
Remove templating for sheet end
Remove tests for old templates