Cleaned up the custom sync strategy code