removed tracking stuf