If this CPP conditional is not required anymore, can we remove these lines, instead of commenting them out?