#1519630 better clean-up