Libraries cleanup