removed tracking of client code