Fix compiler errors + remove useless part to sync