Cleanup of old code
Merge branch 'demo' of https://github.com/utwente-di/di10 into demo