Clean up some bloat.