* Remove test code
* Prepare for tech demo