Cleanup : extract single library