Setup new sync code layout
Removed unnecessary sync code