Cleaned up templated files