Cleanup and sync