removed more traces