Remove optional vars until ansible releases the next version
Merge