more lib1 cleanup