sync with upstream
remove backup