Removed unnecessarily tracked items