Upgrade lib
Cleanup