Improve removing images