Yet more code clean-up.