More demo cleanups.