Some clean-up.