Remove unnecessary guard code