cleanup of old documentation
Merge branch 'dev' into test