cleanup from osx branch merge
remove getopt for osx build