Revert "Adding basic Tag grouping"

This reverts commit ef57073b45d626e57cc503a72167626ef9f0e14b.