Merge "Removed unneeded else branches in DifferenceEngine"