Fix remove tour/step issue