Library Clean Up Nearly Done

Getting close. One or two more passes.