cleaned up sync