Remove isDirty and isScratch