thor: clean up