Some clean-up work.