Source clean-up