I think we'll probably remove the old version of TIP_REMOVE, yes?