Removed some things we no longer want to track