Upgrade libs
Remove unnecessary codes