Fix Data.clear
Fix update/removal detection.