Is this just an unrelated clean-up?