Some of tracking data not removing issue fixed and trace logs added