dave - tidy
dave - remove unused cruft
dave - template paths are now correct with the number of tokens found