Lib cleanup for building...