Clean up in Libs