Merge branch 'issue-51' into 'develop-v4.1.1'

closes Issue 51: delete deprecated classes and properties

See merge request !40