some demo cleanups