Short main.c cleanup

Merged Mladen Ivkovic requested to merge short_main_cleanup into master

found a typo, removed 2 deprecated #ifdef HIST instances.

Merge request reports