clean up of re-direction into data module