Removed test-code (now in branch wip)