Cleanup in 3rdparty libraries