Comment out NIG specific options