[propertysystem] Some cleanup

Merged Timo Koch requested to merge feature/cleanup-property-system into master

Merge request reports