Merge "Delete depricated templates from master branch"