Some small clean-up after using demos.