Merge "Remove unused CellLocation"