FLake8 fixes
Remove bundled templates