Removing some clutter