Start to clean up to a library