Removed persistent stuff related to properties