Cleaning up the property framework; removal of duplicate methods and incorrect assers