This is unrelated cleanup.