Lib cleanup