ext-lib cleanup