Tidy up stuff.