getting rid of some things that don't need tracking...