cleanup prior to upgrade to D7