clean up thor task organization