More cleanup. d -> demo