Removing old D6 cruft.