Remove some code from templates
Merge pull request #1486 from xillibit/k30_bugs5

Remove some code from templates