Reenable several optimizations/remove double level check