Clean up ANN demo

* Add lost commits