delete more #if from util