More lib cleanup.