More demo clean up.