core: Cleanup make_cell, remove tmp cells.