Begining clean up of the library