Image removal updated to be opt-in.