removed old tornado code