Image library change and cleanup