Further library cleanup.