Extract remove into it's own function (like inject)