Remove comment about NOGETOPT
Remove unneeded preprocessor definitions