Preserve tracker properties
Notifications
Removed unused code