Merge "DifferenceEngine cleanup"