some preparation before rearranging out of Sandbox