Merge pull request #1065 from jmaas/master

Remove unused code after ia64 removal.