Remove tags since we won't use them
Merge branch 'remove-tags'