Implemented OptionParser
removed commented old options