Fixes Issue 85: removing unnecessary command-line options