Improve documentation and demo
Remove obsolete code
More unit tests