Revert "Universal Converter new"

This reverts commit 776b34194fb543435770aca12b9d005b1b281449.