some lib cleanup