Updating libraries to latest version, clean up