Remove unnecessary threading