Cleaned up existing templates