Cleanup
more cleanup
Merge branch 'feature/network-demo' into develop