Remove some unused templates. Rename command-line to run