clean up + poc of delta detection