Libraries update and cleanup