Refactor and remove tag support.