fix handling of deleting not-yet-saved properties and cleanups