Clean up a few clutter.