Refactor remove tag