Clean up more