Remove some of the clutter.