*8212* Centralize cell templates; cleanup