[style] fix indent in template.c
[Refactoring] Remove comment-out code for the fixed issue 7469
[Refactoring] Remove unnecessary workaround for issue 1528
Merge pull request #3577 from 9rnsr/refactor_unused

[Refactoring] Remove some unnecessary code