Debug clean-up.