more clean-up related to a1981bdc7ec1ecede357da5b7bb4bf460159990e