Removing ir dependency