Added missing sync methods & cleanup