Don't keep reference to server in workspace
Improve demo app