simplify template inclusion
remove silly comment