Another libraries update and cleanup