- sanity commit: test/demo code cleanup