Revert "DifferenceEngine cleanup"