Removal of deprecated code

- The flag private is deprecated, removed together with the code that was
  affected by it
Merge branch 'removeprivate' into develop