Remove moar GUI stuff
Restart work on data-test