Simple part of removing D1
Remove DMDV1 and DMDV2.
Remove STRUCTTHISREF