Clean 3rdparty mess master



As you said @karlitschek

**3rdparty is a mess**