[haida template] cleaning
Merge pull request #120 from michalbe/flatfish-template-temp

[haida template] cleaning