And one more code cleanup item.