More clean-up of code.