[#1874] better clean-up