Add cmdline parse if commandline_enabled + cleanup