Remove unnecessary CPP condition