More comments, removal of unused code
Version numbers etc.
Merge branch 'release/2.1.5' into develop