Wide scope library clean up