warning clean-up