Add CELLS as prim
Avoid NPE when locals not available; remove unused method