Get rid of some clutter