More cleanup of Score