clean up ORIGIN references