Add a simple step before remove the origin