Removing more clutter