Rebased enc sync

Remove these?