Small documentation fixes, and removal of unused use statements
Merge branch 'develop'