Yes, all the vestiges of the old SPV are still there... I'd say we remove them in a different PR, as it's not really trivial and does not disturb the current SPV.