thunr cleanup