Strip some d2 cruft