Move remove origin requirement to helper app