Fix removal when no mask is used