Remove dependence on rwtag