cleaned up some thunk traces.