clean up code
6.46.3 / libtouch_gui 1.25
Work with vanir