libs/ cleanup