Make delete popup more general