Add some cleanup methods in SyncTracker. Should resolve #21