Remove excessive trace logging