Remove ref to machine values