removed a bunch of stuff that shouldn't be tracked