Some cleaning up stuff.