lib2 cleanup