Remove remaining .enabled variables