cleanup a bit in prep for demo.