Keep only one instance of CellVert commands

Change-Id: I623f47ec06924bf6355ea9531aab1c5286d18a17