vtgate v3: planbuilder cleanup