Cleanup of workshop HOT templates
Merge pull request #1 from t-lin/master

Cleanup of workshop HOT templates