Cleanup templates

:exclamation: