Optimized images, removed logging