Clean up old HelpAndUsage class from last merge. Remove OptionDefinition class and test class and switched to OptionBuilder instead. Not sure why I chose to do OptionDefinition in the first place :)