Changes dashes in option longnames to underscores

Also removed some unused code that was used with n3phele