Remove some clutter