Merge "Removing dead code... DME2 does nothing..."