Removed auto add of -types/-consult-inline-file arguments, cleanup