More code clean-up.