Deleted all of D6, replaced with vanilla D7 core