Remove some unwanted clutter