Bugfix for import from CVpartner
Cleanup after demos