===> Cleaning for sunifdef-3.1.3