Remove unneeded guard and force option for that guard