more library cleanup from dk