Clean up more stuff.