Clean up more stuff