Cleanup/old properties

Merged Timo Koch requested to merge cleanup/old-properties into master

Merge request reports