Clean up the libraries mess