Sync local changes and Cleanup