[wallace] picture pibrary cleanup