clean-up and CI-debugging