rm / fix - TODOs that are no longer needed / fix call to _sync in revert.

Change-Id: Ia56e28ff7705efebe7c7d6d46270a92daa4d612f