Project 4: library clean up...