More IR cleanup