simplify code; remove test code

m.puchnerrequested to merge
simplify into develop
  • Removes UI try-out code
  • Simplifies code by reorganizing and removing overdone indirections

Merge request reports