Removed old debug/demo stuff.