Speedup (image deletion still takes a while for no good reason).