Remove substitutions for cleaner output file names; update docs