Clean up old way to disable variants (using a special name 'disable')