purging unused variants code
Merge commit '7cad4f5f9b7828c564d0fc60a407a70929134cd1' into HEAD