Removed separate handling of legacy custom tags

This means all custom tags (including legacy ones) will have to be validated