Small clean-up after having used the demos