some more library cleanup