Simplified the libraries.