Added missing libs
Clean up libs