Add refund + cleanup