More cleanup of Pole entries