Clean up dependencies and the demo (a little)