Revert "dialogues & choices update"

This reverts commit b1c6b703e91a4024f36d8d4322f3be619745a4e6.