Optimized the way images are removed from load buffer