Cleaned up to reflect new ignores