Dataproperty Cleanup