Updated libraries
Cleanup