Removed definition layer and/or moved it to TagDescriptors