Few more small CellSPU removals.