Fix the cleanup, set tornado direct