master: Now removes those surveys as well.