minor safe cleanup