additional lib cleanup