Remove unused options + allow flags from commandline