remove depricated code

Merged armin requested to merge removeDepricatedCode into master

Merge request reports