clean-up and rename of RawTemplate