removing some unneeded tracking