Some clean-up done.