removed stuff that should not be tracked