Cleanup as prep for the library call