Updating to 07 cleanup level