Normalize removed, part of TB v3